From 3768e2be79bd3b5ffb8d231888204af31ca3b2fe Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 11 May 2007 14:08:57 +0000 Subject: [PATCH] Fall back to GtkSearchEngineSimple only if gthread has already been 2007-05-11 Emmanuele Bassi * gtk/gtksearchengine.c (_gtk_search_engine_new): Fall back to GtkSearchEngineSimple only if gthread has already been initialiased; otherwise, disable search support in the file chooser widget. (#435847) svn path=/trunk/; revision=17819 --- ChangeLog | 7 +++++++ gtk/gtksearchengine.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e9e110a79..8a4020192a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-05-11 Emmanuele Bassi + + * gtk/gtksearchengine.c (_gtk_search_engine_new): Fall back + to GtkSearchEngineSimple only if gthread has already been + initialiased; otherwise, disable search support in the file + chooser widget. (#435847) + 2007-05-10 Matthias Clasen * gtk/gtkbutton.c (gtk_button_set_image): Unparent the old diff --git a/gtk/gtksearchengine.c b/gtk/gtksearchengine.c index 196e944d8e..85145d02e6 100644 --- a/gtk/gtksearchengine.c +++ b/gtk/gtksearchengine.c @@ -104,7 +104,7 @@ _gtk_search_engine_init (GtkSearchEngine *engine) GtkSearchEngine * _gtk_search_engine_new (void) { - GtkSearchEngine *engine; + GtkSearchEngine *engine = NULL; #ifdef HAVE_TRACKER engine = _gtk_search_engine_tracker_new (); @@ -118,7 +118,9 @@ _gtk_search_engine_new (void) return engine; #endif - engine = _gtk_search_engine_simple_new (); + if (g_thread_supported ()) + engine = _gtk_search_engine_simple_new (); + return engine; } -- 2.30.2